WPS Cloning fix