Stop counter fix