Fix the issue #3