resolves the issue #1