Integration bug fix