fixed click handling