Ajay | #3710 | Fixed submission flow