Fix for param groups