Background issue fix