Check some more corner cases