Fix counter troubles