Fix #10 and #11