This should allow us to take care of https://github.com/oaeproject/Hilary/issues/581