Fixed plug-and-play registration issue