Fixed double groups (issue #2256)