CMS Factory fix