Fix bug: #431