hack to get things working for now