Fixed bug with saving drafts