resolved #CM-6