fix for Class recognition