Resolves issue #1446