fix some troubles