Fixing path mapping to Server