Add fix to counter boundary screw ups.