Fix arm64 issue:
replace all int by NSInteger