Fixed Broken Count