Change to cast to right type.
Change to account for empty fields.