collision bug possibly fixed