Resolves issue #1331 with test