Fixed corner cases