Second part of self fixing