Fix bug with GroupController