Resolves issue #1437