fix the issue #9