Fixed to restart with servername properly