an updated patch without the `lookup-key' definition is attached.