Take GH changes into account.