Fixed stalling on server stop