Taking care of more corner cases