Fix for number APIs