Registry fix (18/46)

Registry fix