fix counter not updated when toggling done
merge maste