Removed that AWESOME infinite loop