BUGFIX: Using CMS in place of CSQ