Fix #164
Fix #162