Fix draft functionality