Fix #10 issues