Fix gen-subkey function for client.