Bug fix Form submit