Solving the issue #1