Fixed instance duplication