Merge "Fixed an issue where the background calculatation was wrong"