Fix to prevent double injection