Dealing with more corner cases