fix Buffer support