Base type redefinition fix