workaround issue 3 from #2396