collision fixes