Resolves issue #1161