Resolves issue #1373