Problems when editing a submission

@adrianguzman, FYR: