Figure counter fix