prepare8.1

fix bug with multi-collisions (bad fixing - temporary)