Hopefully fix bug with collision