Fix cross-check