fix some bug (with it have crash)