Fixed the form bug