fix a small bugs