some changes to make benchmarker not crash

DEPLOY