fixed issue: #10, #18