Fix problems with issuer