Fixing submission validaiton