[JMS]: Compatibility with the new CP size