110347-fix-dcs-screwing-over-groups