Fix bug and make it impossible to submit for others