Fix for the CMS list