Single-thread fix