Fixed cross-check detection.