Apply diff from #162