Added fallback to width calc