Added special case for FileFields (blech)