Fix #114, 112