fix for broken drafts. Patch from Ryan O'Neill