Ordering issues

Prior to this commit we still had incorrect counts