v 2.5.2 - perf, hack for data