Fixed speedup problem