Hack to fix timeout