Fix draft support