Fixed issue in CoM