Changed to clicklistener