Solving the Issue #1