fixed Server-API