hack to make it work