Minor change to safe/barf