Removing old attempt at a fix that was calling an infinite loop