Fix maxwidth handling