fix some big bug