Temporary fix for supervisor groups