20141121 - Fixed counter offset issues in primary scope function