Fixed nick change and sorting