Fixing cleaning buffer while choking