Fix buffer_name problem