Fix the discrepency in the way background setup is handled