bottleneck bug fixed