This *should* fix the persistent keys. Tested it and all tests worked properly