Restore group fixing workaround.