Fix #7

I fixed the issue in last commit, but issue didnt close.