Be backward compatible