fixed major performance hog