Quick fix for GroupModel