Fixed time submission issues