Fix CTYP-94 - correct return type for derive