fix test failure.
Merge pull request #832 from gaohoward/master

Fix test failure