Hopefully fixed checkmate issues this time