Fixed the issue #3