NOJIRA fix merge regression