fixed some thing