Fixes #TestIssue