Current nick fix