Fixed click listener