resolves issue #1693