Fixed issue where classes could vary