Found collision bug and fixed it