Change server-code to prevet TTL errors