Revised cross-check mechanism