Fix #173, address #168