Handle some corner cases