group pre and post upgrade fix