Bug fix for classes that are A-F only