Quick hack to get things working