Yet another collision fix