BufferLoader fix