Fix issue with background tasks - seperate background tasks could impact each other