WIP: minor perf. improvement in worker