Fixed group-dependencies