Actually fix wrapping