Fix for non-HttpResponse values