OYS: Skimming protection

OYS: Skimming protection