Fix bug: #16