added silly buffer hack :thumbsup: