workaround for the collision bug finished