Fix #168