Implement even more corner cases