Better handling of width.