Fix to use with 'etcd'.