Ugly hack to make it work