couple of changes to isolate the submit bug