Fix bug of fix bug: #16