another fix around "server runs away"