make rework compatible