Fix Crate's collisions

Fix Crate's collisions