fixed trippy collision