Adding suggestion from #89