Fixed bug in Registry