fix to async problem on Flow/index that causes freezes and slow