fix issue 219
fix issue 219
issue 219
issue 219
issue-219
issue-219
Merge pull request #222 from joyxiong/issue-219

fix issue 219
Sync with latest linkedin/naarad