fix some troubles
fix some troubles