Fixed submit issue