Try to fix product group issue