Fixed shift-clicking