Fix NIS

Ticket: #4955