bug fixes class names