Fix #91 properly.