Remove scale method and fix scan