Fix context switching between wd context methods