Issue 382 - Too many cooks ...