Solves for issue #401

Parity handling with the new NAN string handling thanks to @sguilly.