fix some bugd