Yet another fix to all/allOrNone