NOJIRA Fix previous commit