Fixed submitting restrictions

Closes #1452