Fix folding bug in draft too