Fix saving comments