Addresses https://github.com/theodi/orpi-corpus/issues/8