Fix #110