Fix #2 and #10