Fix #149
Fix #154