Fixed organization view conflict