Fix #110 #111