Form add handler reverted to previous state
Fixed data type bug