Fixed recursion bug introduced in 910eaefa61808ca65237f088846bc59cf9f0c6c8