Fix draft bug