Fixing the issue #123