Fix wrapping collision issue