better fix for stoppable, propagate fix through project