metavalue-tolerance: additional fix