Fix empty response bug