Fix #216 #237