Resolves issue #1194