Group - fixed issue #5