Attempt to fix count==0