include changes from #372