Now properly handles integer fields.