Removed infinite check