Added quickfix for NULLABLE_SUPERTYPE