buf-fix