click handling fixed