NOJIRA: Edited to agree with upstream