Solving the issue #192