Fixing issue with populatekeystore