Hotfix for background bugs