Another Safety Commit

Another Safety Commit