Redundant safe calls again