Don't break compatibility