Fix server commit in handler