Could we remove this test in that case?