Fix bug: #15