Fix #140