Less buggy collision resolving