Faulty relative EntityId values are back!