fix some buges