Buffer local fix