Fixed another overriding corner case