Hack to make bug-report work again