Fix for AmountFromValue()