Fix bug #1100191 and nls USE flag