Fix bottleneck