Fix role/volume_group calculation