Fixing the sanity checks