buffer fix (some failures remaining)