bug fix in window isolator
Merge remote-tracking branch 'origin/master'