Buffertype fix