fixing safe targets