Adjustment for duplicate class