Fix for draft items