Need to use the @hybridgroup fork