Handle multiple clicks better