fix issue with saving comments