Fix server commit