Fix #170
Fix #159