Last changes for nickname to work