Revert "Fixed Issue #2434"

This reverts commit 3fad259210c250a9529dc6f2c2e3718bfe307f81.
Re-fixed the issue #2434 as recommended by Xie Kai