How about getting your Wapi rescaled???? that should solve you issues.