Fix #7
Fix #9