Fix #157