fix the CROS issu