Fixed issues with groups