Fix for Issue #35: remove static buf