further work on fixing public key issue