20141119 - Counter issues again - fixed