Hopefully a fix to the speedup problem