Fix: The CLASSNAME attribute is not honored