Fixed OOO bug