Fix backward compat problem.