FIXED: Correctly group (all) for unicorn