Try to Fix duplicate complete issue