Solved bug: #26