Working on integration bug