Working on resolving issue 8968