Fix for DataType NUMBER