Fix #9
Fix #10