Post save bug fix