Fix #20 issue

Thanks.