Trying again to fix infinite loop.