Fixed bug where submission was getting over written