Fixed nick splitting