Fix #167