Fix required field bug