Fixing issue with CIM viewer.