remove special case for submit, fixes #6