#248 references was flaky removing