Fix function context issue which causes drafting problem