I'd apply both of those fixes. The first one definitely needs to be done, the second one is a good one to put in just in case you have any messed up groups.