Resolves issue #1361