Fix #87 from #83