Used the master key to fix duplication bugs