Merge pull request #1846 from CouleeApps/background-fix