integration bug fix