Fix #12, #13 issue.