more fix to cms