Fixes the duplication problem