Fixed the issue #6