Fix for missing code in Name Parser