potential fix for ctrl-middleclick crash (merged from trunk)