Duplication problem almost fixed