Fix auto-wrap