last fix of code for submit