Use different vars here, it isn't catching in some cases with the old one