Cleaned Buffer Fix 03-1

Forgot to save changes from fix 03.