Fix extension recursion problem