Fix for draft items

Bug #3574