collision bug fixed