Adapt for RH7