Fix collision

Fix collision
Hopefully fix flicker