Fixed the issue #5