fixes from #93