Is this logic covered by the existing tests? If not, could we add some test coverage?