Beta2 Fix class call order.