Take 2 at fixing unbreakable code