added missing changes from #193