Fix wrapping (now really)