safe-bool fix