fixed a bugged control in advanced using the wrong window id
Merge remote-tracking branch 'origin/master'