missing commit from #85