Address the edge cases