#20 counting delay fix