forgot #85 fix