Slightly better? width handling