perf work + re-benchmarked because of bug #258