Temp Fix -- Buffer Problems