nlpir fixes