Group fix

Closes #157