Fix X count issue.