Removed another performance bottleneck