Replace infinite recursion bug with assert
Fixup