Fix server response