reverse pull request 397, it not a bug. Just should this way