Nasty hack to fix issues