fix new style classes