Feature/public key ring fix