Get rid of the severe performance bottleneck