Trying a collision fix, not super successful