(master) fixed click handler stuff