Fix convert_to_draft to correctly return a draft