Fix #116