Fix hardcoded field #