required changes from #pr/201