Fixing weird shift-clicking issues