Trying to fix bufs