Fixing gpg stage