Merge "Fixing submit"