Fix #10
Fix #8