Fixed click handler