Update to recent Alix change