Fixed for the new classes.