The second half of the #81 fix

  Accidentally didn't commit some additional changes.  This is the other half of
56028ec.