Merge pull request #281 from wcwang/next

[Contact] Bug fixing.