Buggfix kollision