Fix function context issue which causes drafting problem
Merge pull request #1604 from darkwing/fix-drafting-issue

Fix function context issue which causes drafting problem