Trying to fix slow after long time running.