Fixes groups to map