Handle corner cases