Fix bug: #398