add missing changes from #1949