fixes part of #86