keystore leak fix