Fix to limit scope groups