The change that was required was already in place, it was just to late. So
moved that earlier in the method and removed new code otherwise we try and
fix it twice which in turn, breaks it