Fix #10, fix #11