Fixed minor click handler bug