fixing master buffer