Correct click issues