Fix Some Bug for Market