Merge pull request #325 from LuffyWang/next

[Contact] Bug fixing.