Fix attach Point code