Safety commit

In case anything goes wrong AGAIN