and one more minor tweak for safety