Fix #173
Fix #174
Fix #175