[NPanday] Review for NPanday-13984

[Liit Padilla]

Hi All,

I have an initial fix for this issue: 
http://npanday.codeplex.com/workitem/13984

I'd gladly welcome any comments/suggestions.

Thanks,

liit