Fix backward-compatibility layer