Fixed shift-clicking issue