Fix for group choices