fixed form-bug