Fix for transition to hostgrouplogic