fix some stug