fix ig function context at queuing
cleanup.