fix up collision