Fix collision with movement