Fixes mantis #6636 -- Groups