Fixed bad assumption, that we are always on Main Server (no distinction between main server, localhost and test server)