Fixed double submit issue