Possible remediation of issue 9