Registry fix (17/46)

Registry fix