Fixed issues with parsing numeric values