Fix #116
Fix #117