Fix port to not do recursion...