Fix backward compat issue