Fixed issues with "$className"