Fix error on selecting draft, fix #2033
Caused by implementation of #2009