(maybe) Fix bug: #422