Small optimization to P95