Fix collision bug