codingchipmunk
diff --git a/‎quantities/quantity.py‎
Lines changed: 1 addition & 1 deletion b/‎quantities/quantity.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎quantities/tests/test_arithmetic.py‎
Lines changed: 6 additions & 0 deletions b/‎quantities/tests/test_arithmetic.py‎
Lines changed: 6 additions & 0 deletions
@@ -59,7 +59,7 @@ def g(self, other, *args):
         if not isinstance(other, Quantity):
             other = other.view(type=Quantity)
         if other._dimensionality != self._dimensionality:
-            other = other.rescale(self.units)
+            other = other.rescale(self.units, dtype=np.result_type(self.dtype, other.dtype))
         return f(self, other, *args)
     return g
 
 
@@ -358,6 +358,12 @@ def test_in_place_subtraction(self):
         self.assertRaises(ValueError, op.isub, [1, 2, 3]*pq.m, pq.J)
         self.assertRaises(ValueError, op.isub, [1, 2, 3]*pq.m, 5*pq.J)
 
+    def test_division(self):
+        molar = pq.UnitQuantity('M',  1e3 * pq.mole/pq.m**3, u_symbol='M')
+        for subtr in [1, 1.0]:
+            q = 1*molar/(1000*pq.mole/pq.m**3)
+            self.assertQuantityEqual((q - subtr).simplified, 0)
+
     def test_powering(self):
         # test raising a quantity to a power
         self.assertQuantityEqual((5.5 * pq.cm)**5, (5.5**5) * (pq.cm**5))