fix backward compat