Collision fixes with trollback design