Fix some bug on market