More consistent wrapping