resolved #CM-37