Fix bug: #2