Resolves issue #1615