fix for company class?