Fixing count issue