Fixed control groups, Fixes #76