Fix #237