move to patched cordoba-lib