fix some bug?