Fix extension class