Slight tweaks
Infinite loop?
Revert "Infinite loop?"

This reverts commit c7bcfa01cb86f37ebb86a565d9d33a6cf009e521.
Amazing!