Fix client - server for spaces