Fixed speedup on restart