Bugfix: No mixed up server names