safety first

#1722