Buffer little bugfix