fix collide
fix position