Fixed checkmate issues