Fix wrap behavior