Fix: #138, #137.