Fix counter - I'll do this properly later.