found bottleneck & fix