Fix bug in submit