Resolves issue #1160