Better handling of float fields