Compat with CMS 1.10