Merge: nitcorn: possible fix for the bug on input with unicode