Fix #32: Done