Fix #12 #11 #10