Fix collision issues