fix for case of class