Fixxed saving of comments