Fixed: #21 #10