Reapplying backgrounding bug fix