Compensation for issues from Update 2.1