Got rid of WhiteVsWhite bug