Double commit background fix part 1
Double commit background fix part 2