Adressed server stop bug