Fix for empty responses