Began fixing click handler bug