Bugfix for draft