Fix Group constructor