restore correct logic on compatibility