Rectangles should hopefully be detected properly now