Fixed better collision reaction