BAZYNGO-1450: Component class fix.