few fix to handle replaying move with bad color