Fix buffet behavior