Resolves issue #1516