Fixed mouse click listeners