Attemped fix for nightly stalling problem