Resolves issue #1518