Make something wrap better