Fixing issue with draft prompt not firing in some cases