More corner cases!