Rethink corner cases