Added a few more corner cases