fix some work