Changes for counter roll-over