bug fix : wrong buf returned.