Fixed submission issue