Fixed #18, #20 issues.