[Servers] Let's make that make a bit more sense