Fix duplication hopefully