hack to fix broken staging