Revert "Revert commit,issue 25 won't be fixed"

This reverts commit 75746ba082416c11a28e031f122d59313155e69b.