Fixing draft logic