cms save bug fix