Fixed issue with numbers strings not being numbers