Fix collision problem