#15 clickable counters fix