Fix infinite recursion... again