Fixed bug with collision