Added a couple corner cases