Fixed issue in handling incomplete responses