speedup fix 2