Fixed nick changes