New build. Fixed nul count bug.