Put missing correction
and change collision check