Added a safeguard for FloatFields