Resolving issue #9442