Fix for missing "all" short-circuit