Removed infinite recursion