Fix: Code ready for benchmark.