Upgrade to CM 1.2.87