Fix backward compat