Added support for multiple digits