Improve width handling #74