imported patch compact-test-fix