CFY-1681 fixed keypair creation