server commit fix