Fixed issue with class names