fix backward compati