This logic seems new. Is it a different bug? Should we have a test for it?