Fix class order.