fix backward compatible issue