fixed the issue #9