Fix infinite loop, I'm very curious why this doesn't cause problems on master when it very obviously should