Fix bug: #425
[sync] 1.3.8.10