Removed infinite loop