Modify for the issue #3