fix for speed up