Update patch from #2