Fix bufferunderflow