Better fingerprinting