A bit more wrap testing, but revealed an issue...