UI-2535: Correct the probelm caused by added class .