Fix #118