Fix the single thread case