Fix #45: done