https://github.com/slyphon/zk/pull/48