Fix Submit's behavior