added fix for class name detection