[#58042152] Class fix