Resolves issue #1169