removed adding buffer class on stalled