Patch for registry / Thk to Xavier Lemaire <xavier@amassi-network.com>