Fix problem with speedup