fix immediate dispatch vars
block extra completion
Merge branch 'fix-dispatch'