Hack to keep the thing running