fixed #2, #10