Correct the logic for defaulting the extension class