Fixed issue with class name storage