[Jaws_Registry]: Fixed an issue