diff --git a/go/operation/chunked_file.go b/go/operation/chunked_file.go
index dbc450fd8..f8266087b 100644
--- a/go/operation/chunked_file.go
+++ b/go/operation/chunked_file.go
@@ -87,7 +87,7 @@ func (cm *ChunkManifest) DeleteChunks(master string) error {
 //	return nil
 //}
 
-func httpRangeDownload(fileUrl string, w io.Writer, offset int64) (written int64, e error) {
+func readChunkNeedle(fileUrl string, w io.Writer, offset int64) (written int64, e error) {
 	req, err := http.NewRequest("GET", fileUrl, nil)
 	if err != nil {
 		return written, err
@@ -112,7 +112,7 @@ func httpRangeDownload(fileUrl string, w io.Writer, offset int64) (written int64
 	case http.StatusPartialContent:
 		break
 	default:
-		return written, fmt.Errorf("Read Needle http error: [%d] %s", resp.StatusCode, fileUrl)
+		return written, fmt.Errorf("Read chunk needle error: [%d] %s", resp.StatusCode, fileUrl)
 
 	}
 	return io.Copy(w, resp.Body)
@@ -158,7 +158,7 @@ func (cf *ChunkedFileReader) WriteTo(w io.Writer) (n int64, err error) {
 		if lookupError != nil {
 			return n, lookupError
 		}
-		if wn, e := httpRangeDownload(fileUrl, w, chunkStartOffset); e != nil {
+		if wn, e := readChunkNeedle(fileUrl, w, chunkStartOffset); e != nil {
 			return n, e
 		} else {
 			n += wn
diff --git a/go/weed/weed_server/volume_server_handlers_write.go b/go/weed/weed_server/volume_server_handlers_write.go
index cd4a4c673..1f0fa96dd 100644
--- a/go/weed/weed_server/volume_server_handlers_write.go
+++ b/go/weed/weed_server/volume_server_handlers_write.go
@@ -75,6 +75,7 @@ func (vs *VolumeServer) DeleteHandler(w http.ResponseWriter, r *http.Request) {
 			writeJsonError(w, r, http.StatusInternalServerError, errors.New("Load chunks manifest error: "+e.Error()))
 			return
 		}
+		// make sure all chunks had deleted before delete manifest
 		if e := chunkManifest.DeleteChunks(vs.GetMasterNode()); e != nil {
 			writeJsonError(w, r, http.StatusInternalServerError, errors.New("Delete chunks error: "+e.Error()))
 			return