Checkmate bugfix