BAC-1008: fix for background

Backported #2007