Finally removed strange wave problem