re-Fix hardcoded field #