Added server response fix