Attempt to fix nightly stalling problem