Fix bug: #435