Does #83 fix this?