Bug fix in safety_req